Skip to content

Update RLS and Rustfmt #56406

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 1 commit into from
Dec 2, 2018
Merged

Update RLS and Rustfmt #56406

merged 1 commit into from
Dec 2, 2018

Conversation

nrc
Copy link
Member

@nrc nrc commented Dec 1, 2018 •
edited by kennytm
Loading

Closes #56261

@rust-highfive
Copy link
Contributor

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 1, 2018
@kennytm
Copy link
Member

kennytm commented Dec 1, 2018

@bors r+

@bors
Copy link
Collaborator

bors commented Dec 1, 2018

📌 Commit 7a7445b has been approved by kennytm

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 1, 2018
@Mark-Simulacrum
Copy link
Member

@bors p=1

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Dec 1, 2018
@Mark-Simulacrum
Rollup merge of rust-lang#56406 - nrc:update, r=kennytm
4f3b334 
Update RLS and Rustfmt

Closes rust-lang#56261

r? @kennytm
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Dec 1, 2018
Closed
bors added a commit that referenced this pull request Dec 1, 2018
@bors
Auto merge of #56408 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
5a0257f 
Rollup of 9 pull requests

Successful merges:

 - #55010 (Add template parameter debuginfo to generic types)
 - #56110 (Consider references and unions potentially inhabited during privacy-respecting inhabitedness checks)
 - #56305 (update miri)
 - #56372 (Refer to the second borrow as the "second borrow" in E0501.rs)
 - #56394 (Deal with EINTR in net timeout tests)
 - #56395 (Stabilize dbg!(...))
 - #56402 (Improve the unstable book example for #56408 [marker] trait)
 - #56406 (Update RLS and Rustfmt)
 - #56366 (Stabilize self_in_typedefs feature)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Dec 1, 2018

⌛ Testing commit 7a7445b with merge e9e484a2132ed0a1ff1662dbb56cf0a77e0f9a50...

@bors
Copy link
Collaborator

bors commented Dec 1, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 1, 2018
@nrc
Copy link
Member Author

nrc commented Dec 1, 2018

run-make failure - seems unlikely to be this PR, but I can't explain it

@nikic
Copy link
Contributor

nikic commented Dec 1, 2018

@nrc This is a spurious failure introduced by #49878, which will (hopefully) be fixed once #56396 lands.

@dlrobertson
Copy link
Contributor

#56396 landed... Thanks for you patience, this is probably due for a retry

@kennytm
Copy link
Member

kennytm commented Dec 2, 2018

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 2, 2018
@Centril Centril mentioned this pull request Dec 2, 2018
Closed
@bors
Copy link
Collaborator

bors commented Dec 2, 2018

⌛ Testing commit 7a7445b with merge ed838c12576ba5a988a98a637639d26569f1b5f9...

@bors
Copy link
Collaborator

bors commented Dec 2, 2018

💔 Test failed - status-travis

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 2, 2018
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 2, 2018
@rust-highfive
Copy link
Contributor

The job dist-i686-freebsd of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
Building stage2 tool cargo (i686-unknown-freebsd)
[01:06:44]  Downloading crates ...
[01:07:04] warning: spurious network error (2 tries remaining): [6] Couldn't resolve host name (Could not resolve host: crates.io)
[01:07:24] warning: spurious network error (1 tries remaining): [6] Couldn't resolve host name (Could not resolve host: crates.io)
[01:07:44] error: failed to download from `https://crates.io/api/v1/crates/openssl-src/111.0.1+1.1.1/download`
[01:07:44] Caused by:
[01:07:44]   [6] Couldn't resolve host name (Could not resolve host: crates.io)
[01:07:44] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "i686-unknown-freebsd" "-j" "4" "--release" "--locked" "--color" "always" "--manifest-path" "/checkout/src/tools/cargo/Cargo.toml" "--features" "rustc-workspace-hack/all-static" "--message-format" "json"
[01:07:44] expected success, got: exit code: 101
---
travis_time:end:13228ce4:start=1543734226512744532,finish=1543734226520785421,duration=8040889
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0d872d29
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:001c9c06
travis_time:start:001c9c06
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:01054a50
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@kennytm
Copy link
Member

kennytm commented Dec 2, 2018

@bors retry travis-ci/travis-ci#9696

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 2, 2018
@bors
Copy link
Collaborator

bors commented Dec 2, 2018

⌛ Testing commit 7a7445b with merge 0765eb9...

bors added a commit that referenced this pull request Dec 2, 2018
@bors
Auto merge of #56406 - nrc:update, r=kennytm
0765eb9 
Update RLS and Rustfmt

Closes #56261
@bors
Copy link
Collaborator

bors commented Dec 2, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing 0765eb9 to master...

@bors bors merged commit 7a7445b into rust-lang:master Dec 2, 2018
@Xanewok Xanewok mentioned this pull request Dec 3, 2018
Closed
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@kennytm kennytm

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@nrc @rust-highfive @kennytm @bors @Mark-Simulacrum @nikic @dlrobertson